@scrider/formatter 1.4.3 → 1.5.0

package/dist/index.cjs

@@ -43,12 +43,15 @@ __export(index_exports, {
   Registry: () => Registry,
   SCRIDER_LINE_HEIGHT_KEY: () => SCRIDER_LINE_HEIGHT_KEY,
   SCRIDER_MARGIN_AFTER_KEY: () => SCRIDER_MARGIN_AFTER_KEY,
+  SCRIDER_MARGIN_BEFORE_KEY: () => SCRIDER_MARGIN_BEFORE_KEY,
   alertBlockHandler: () => alertBlockHandler,
   alignFormat: () => alignFormat,
   backgroundFormat: () => backgroundFormat,
   blockFormat: () => blockFormat,
   blockLineHeightStyleParts: () => blockLineHeightStyleParts,
   blockMarginAfterStyleParts: () => blockMarginAfterStyleParts,
+  blockMarginBeforeStyleParts: () => blockMarginBeforeStyleParts,
+  blockParagraphMarginStyleParts: () => blockParagraphMarginStyleParts,
   blockPresentationStyleParts: () => blockPresentationStyleParts,
   blockquoteFormat: () => blockquoteFormat,
   boldFormat: () => boldFormat,
@@ -102,6 +105,8 @@ __export(index_exports, {
   normalizeDelta: () => normalizeDelta,
   parseScriderLineHeightMultiplier: () => parseScriderLineHeightMultiplier,
   parseScriderMarginAfterEm: () => parseScriderMarginAfterEm,
+  parseScriderMarginBeforeEm: () => parseScriderMarginBeforeEm,
+  parseScriderMarginEm: () => parseScriderMarginEm,
   preloadRemark: () => preloadRemark,
   resolveDocumentPresentation: () => resolveDocumentPresentation,
   resolveTablePresentation: () => resolveTablePresentation,
@@ -2615,6 +2620,7 @@ function slugifyWithDedup(text, usedSlugs) {
 // src/conversion/html/block-presentation.ts
 var SCRIDER_LINE_HEIGHT_KEY = "scrider-line-height";
 var SCRIDER_MARGIN_AFTER_KEY = "scrider-margin-after";
+var SCRIDER_MARGIN_BEFORE_KEY = "scrider-margin-before";
 var LINE_HEIGHT_BLOCK_TAGS = /* @__PURE__ */ new Set(["p", "li", "blockquote"]);
 var PARAGRAPH_SPACING_BLOCK_TAGS = /* @__PURE__ */ new Set(["p"]);
 function parseScriderLineHeightMultiplier(value) {
@@ -2645,7 +2651,7 @@ function blockLineHeightStyleParts(tag, blockAttributes, resolved) {
   }
   return [];
 }
-function parseScriderMarginAfterEm(value) {
+function parseScriderMarginEm(value) {
   const trimmed = value.trim();
   if (!trimmed) return void 0;
   const emMatch = trimmed.match(/^(-?\d+(?:\.\d+)?)\s*em$/i);
@@ -2658,20 +2664,59 @@ function parseScriderMarginAfterEm(value) {
   if (Number.isFinite(n) && n >= 0) return n;
   return void 0;
 }
-function marginAfterStyleParts(em) {
-  return [`margin-top:0`, `margin-bottom:${em}em`];
+var parseScriderMarginAfterEm = parseScriderMarginEm;
+var parseScriderMarginBeforeEm = parseScriderMarginEm;
+function resolveParagraphMarginEm(blockAttributes, blockKey, documentEm) {
+  const raw = blockAttributes?.[blockKey];
+  if (typeof raw === "string") {
+    const fromBlock = parseScriderMarginEm(raw);
+    if (fromBlock !== void 0) return fromBlock;
+  }
+  return documentEm;
 }
-function blockMarginAfterStyleParts(tag, blockAttributes, resolved) {
+function blockParagraphMarginStyleParts(tag, blockAttributes, resolved) {
   if (!PARAGRAPH_SPACING_BLOCK_TAGS.has(tag)) return [];
-  const raw = blockAttributes?.[SCRIDER_MARGIN_AFTER_KEY];
-  if (typeof raw === "string") {
-    const fromBlock = parseScriderMarginAfterEm(raw);
-    if (fromBlock !== void 0) return marginAfterStyleParts(fromBlock);
+  const marginTop = resolveParagraphMarginEm(
+    blockAttributes,
+    SCRIDER_MARGIN_BEFORE_KEY,
+    resolved?.paragraphSpacingBeforeEm
+  );
+  const marginBottom = resolveParagraphMarginEm(
+    blockAttributes,
+    SCRIDER_MARGIN_AFTER_KEY,
+    resolved?.paragraphSpacingAfterEm
+  );
+  if (marginTop === void 0 && marginBottom === void 0) return [];
+  const parts = [];
+  if (marginTop !== void 0) {
+    parts.push(`margin-top:${marginTop}em`);
+  } else if (marginBottom !== void 0) {
+    parts.push("margin-top:0");
   }
-  if (resolved?.paragraphSpacingAfterEm !== void 0) {
-    return marginAfterStyleParts(resolved.paragraphSpacingAfterEm);
+  if (marginBottom !== void 0) {
+    parts.push(`margin-bottom:${marginBottom}em`);
   }
-  return [];
+  return parts;
+}
+function blockMarginAfterStyleParts(tag, blockAttributes, resolved) {
+  if (!PARAGRAPH_SPACING_BLOCK_TAGS.has(tag)) return [];
+  const marginBottom = resolveParagraphMarginEm(
+    blockAttributes,
+    SCRIDER_MARGIN_AFTER_KEY,
+    resolved?.paragraphSpacingAfterEm
+  );
+  if (marginBottom === void 0) return [];
+  return ["margin-top:0", `margin-bottom:${marginBottom}em`];
+}
+function blockMarginBeforeStyleParts(tag, blockAttributes, resolved) {
+  if (!PARAGRAPH_SPACING_BLOCK_TAGS.has(tag)) return [];
+  const marginTop = resolveParagraphMarginEm(
+    blockAttributes,
+    SCRIDER_MARGIN_BEFORE_KEY,
+    resolved?.paragraphSpacingBeforeEm
+  );
+  if (marginTop === void 0) return [];
+  return [`margin-top:${marginTop}em`];
 }
 
 // src/conversion/html/document-presentation.ts
@@ -2681,10 +2726,17 @@ function resolveDocumentPresentation(presentation) {
   const textIndentCm = typeof presentation.textIndentCm === "number" && presentation.textIndentCm > 0 ? presentation.textIndentCm : void 0;
   const listBlockIndentCm = typeof presentation.listBlockIndentCm === "number" && presentation.listBlockIndentCm > 0 ? presentation.listBlockIndentCm : void 0;
   const paragraphSpacingAfterEm = typeof presentation.paragraphSpacingAfterEm === "number" && Number.isFinite(presentation.paragraphSpacingAfterEm) && presentation.paragraphSpacingAfterEm >= 0 ? presentation.paragraphSpacingAfterEm : void 0;
-  if (lineSpacing === void 0 && paragraphSpacingAfterEm === void 0 && textIndentCm === void 0 && listBlockIndentCm === void 0) {
+  const paragraphSpacingBeforeEm = typeof presentation.paragraphSpacingBeforeEm === "number" && Number.isFinite(presentation.paragraphSpacingBeforeEm) && presentation.paragraphSpacingBeforeEm >= 0 ? presentation.paragraphSpacingBeforeEm : void 0;
+  if (lineSpacing === void 0 && paragraphSpacingAfterEm === void 0 && paragraphSpacingBeforeEm === void 0 && textIndentCm === void 0 && listBlockIndentCm === void 0) {
     return void 0;
   }
-  return { lineSpacing, paragraphSpacingAfterEm, textIndentCm, listBlockIndentCm };
+  return {
+    lineSpacing,
+    paragraphSpacingAfterEm,
+    paragraphSpacingBeforeEm,
+    textIndentCm,
+    listBlockIndentCm
+  };
 }
 var TEXT_INDENT_TAGS = /* @__PURE__ */ new Set(["p"]);
 function documentPresentationListWrapperStyleParts(resolved) {
@@ -2702,7 +2754,7 @@ function documentPresentationStyleParts(tag, resolved) {
 function blockPresentationStyleParts(tag, blockAttributes, resolved) {
   return [
     ...blockLineHeightStyleParts(tag, blockAttributes, resolved),
-    ...blockMarginAfterStyleParts(tag, blockAttributes, resolved),
+    ...blockParagraphMarginStyleParts(tag, blockAttributes, resolved),
     ...documentPresentationStyleParts(tag, resolved)
   ];
 }
@@ -2804,7 +2856,16 @@ function deltaToHtml(delta, options = {}) {
       counters = [];
       const codeLines = collectCodeBlockLines(lines, i);
       const language = getCodeBlockLanguage(line.attributes);
-      html += renderCodeBlock(codeLines, language, embedRenderers, pretty, blockHandlers, options);
+      const codeBlockId = getCodeBlockId(line.attributes);
+      html += renderCodeBlock(
+        codeLines,
+        language,
+        embedRenderers,
+        pretty,
+        blockHandlers,
+        options,
+        codeBlockId
+      );
       i += codeLines.length - 1;
       continue;
     }
@@ -3075,11 +3136,13 @@ function collectCodeBlockLines(lines, startIndex) {
   const startLine = lines[startIndex];
   if (!startLine) return codeLines;
   const startLang = getCodeBlockLanguage(startLine.attributes);
+  const startId = getCodeBlockId(startLine.attributes);
   for (let i = startIndex; i < lines.length; i++) {
     const line = lines[i];
     if (!line || !line.attributes?.["code-block"]) break;
     const lang = getCodeBlockLanguage(line.attributes);
-    if (i > startIndex && lang !== startLang) break;
+    const id = getCodeBlockId(line.attributes);
+    if (i > startIndex && (lang !== startLang || id !== startId)) break;
     codeLines.push(line);
   }
   return codeLines;
@@ -3092,14 +3155,20 @@ function getCodeBlockLanguage(attributes) {
   }
   return void 0;
 }
-function renderCodeBlock(codeLines, language, embedRenderers, pretty, blockHandlers, options) {
+function getCodeBlockId(attributes) {
+  if (!attributes) return void 0;
+  const id = attributes["code-block-id"];
+  return typeof id === "string" ? id : void 0;
+}
+function renderCodeBlock(codeLines, language, embedRenderers, pretty, blockHandlers, options, codeBlockId) {
   const lineContents = codeLines.map(
     (line) => renderLineContent(line.ops, embedRenderers, blockHandlers, options)
   );
   const code = lineContents.join("\n");
   const langClass = language ? ` class="language-${escapeHtml(language)}"` : "";
   const langAttr = language ? ` data-language="${escapeHtml(language)}"` : "";
-  const html = `<pre${langAttr}><code${langClass}>${code}
+  const idAttr = codeBlockId ? ` data-code-block-id="${escapeHtml(codeBlockId)}"` : "";
+  const html = `<pre${langAttr}${idAttr}><code${langClass}>${code}
 </code></pre>`;
   return pretty ? html + "\n" : html;
 }
@@ -3313,6 +3382,7 @@ function htmlToDelta(html, options = {}) {
   let currentBlockAttributes = {};
   let pendingText = "";
   let atLineStart = true;
+  let codeBlockIdSeq = 0;
   const context = {
     delta,
     get attributes() {
@@ -3525,6 +3595,8 @@ function htmlToDelta(html, options = {}) {
     }
     const codeBlockValue = language || true;
     currentBlockAttributes["code-block"] = codeBlockValue;
+    const existingId = element.getAttribute("data-code-block-id");
+    currentBlockAttributes["code-block-id"] = existingId || `cb-${++codeBlockIdSeq}`;
     const sourceElement = codeElement || element;
     const rawText = sourceElement.textContent ?? "";
     const text = rawText.endsWith("\n") ? rawText.slice(0, -1) : rawText;
@@ -4260,11 +4332,13 @@ function collectCodeBlock(lines, startIndex) {
   const startLine = lines[startIndex];
   if (!startLine) return codeLines;
   const startLang = getCodeBlockLanguage2(startLine.attributes);
+  const startId = getCodeBlockId2(startLine.attributes);
   for (let i = startIndex; i < lines.length; i++) {
     const line = lines[i];
     if (!line || !line.attributes["code-block"]) break;
     const lang = getCodeBlockLanguage2(line.attributes);
-    if (i > startIndex && lang !== startLang) break;
+    const id = getCodeBlockId2(line.attributes);
+    if (i > startIndex && (lang !== startLang || id !== startId)) break;
     codeLines.push(line);
   }
   return codeLines;
@@ -4382,6 +4456,10 @@ function getCodeBlockLanguage2(attributes) {
   }
   return void 0;
 }
+function getCodeBlockId2(attributes) {
+  const id = attributes["code-block-id"];
+  return typeof id === "string" ? id : void 0;
+}
 function renderLineContent2(ops, embedRenderers, inCodeBlock, useLatexDelimiters = false, blockHandlers, prettyHtml = false, registry, softBreakStyle = "spaces", inTableCell = false) {
   let result = "";
   for (const op of ops) {
@@ -4735,6 +4813,7 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
   let pendingText = "";
   const spanAttrStack = [];
   const footnoteDefinitions = /* @__PURE__ */ new Map();
+  let codeBlockIdSeq = 0;
   const context = {
     delta,
     pushText(text, attrs) {
@@ -5050,7 +5129,8 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
     }
     const lines = code.split("\n");
     const codeBlockAttr = {
-      "code-block": lang ?? true
+      "code-block": lang ?? true,
+      "code-block-id": `cb-${++codeBlockIdSeq}`
     };
     for (const line of lines) {
       context.pushText(line);
@@ -5064,7 +5144,10 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
       context.pushNewline();
     } else {
       const lines = value.split("\n");
-      const mathBlockAttr = { "code-block": "math" };
+      const mathBlockAttr = {
+        "code-block": "math",
+        "code-block-id": `cb-${++codeBlockIdSeq}`
+      };
       for (const line of lines) {
         context.pushText(line);
         context.pushNewline(mathBlockAttr);
@@ -5342,12 +5425,15 @@ function extractTableRegion(ops, hintOpIdx) {
   Registry,
   SCRIDER_LINE_HEIGHT_KEY,
   SCRIDER_MARGIN_AFTER_KEY,
+  SCRIDER_MARGIN_BEFORE_KEY,
   alertBlockHandler,
   alignFormat,
   backgroundFormat,
   blockFormat,
   blockLineHeightStyleParts,
   blockMarginAfterStyleParts,
+  blockMarginBeforeStyleParts,
+  blockParagraphMarginStyleParts,
   blockPresentationStyleParts,
   blockquoteFormat,
   boldFormat,
@@ -5401,6 +5487,8 @@ function extractTableRegion(ops, hintOpIdx) {
   normalizeDelta,
   parseScriderLineHeightMultiplier,
   parseScriderMarginAfterEm,
+  parseScriderMarginBeforeEm,
+  parseScriderMarginEm,
   preloadRemark,
   resolveDocumentPresentation,
   resolveTablePresentation,